Revision: tla--devo--1.1--patch-8
Archive: arch@repose.cx--03
Creator: Damien Elmes <resolve@repose.cx>
Date: Tue Jul  1 17:32:29 EST 2003
Standard-date: 2003-07-01 07:32:29 GMT
Summary: merge with lord
Keywords: 
New-files: ./libarch/ancestry.c ./libarch/ancestry.h
    ./libarch/cmd-ancestry.c ./libarch/cmd-ancestry.h
    ./libarch/cmd-star-merge.c ./libarch/cmd-star-merge.h
    ./libarch/exec.c ./libarch/exec.h ./libarch/star-merge.c
    ./libarch/star-merge.h
New-directories: 
Removed-files: 
Removed-directories: 
Renamed-files: ./libfsutils/diffs.c ./libarch/diffs.c
    ./libfsutils/diffs.h ./libarch/diffs.h
Renamed-directories: 
Modified-files: ./=THANKS ./=TODO ./ChangeLog
    ./PLUGIN/options ./libarch/apply-changeset.c
    ./libarch/archive-fs.c ./libarch/archive.c
    ./libarch/cmd-archive-mirror.c ./libarch/cmds.c
    ./libarch/commit.c ./libarch/diffs.c ./libarch/diffs.h
    ./libarch/file-diffs.c ./libarch/local-cache.c
    ./libarch/make-changeset-files.c
    ./libarch/make-changeset.c ./libarch/my.c ./libarch/my.h
    ./libarch/namespace.c ./libarch/patch-logs.c
    ./libarch/patch-logs.h ./libarch/pfs-sftp.c
    ./libarch/pristines.c ./libarch/tag.c
    ./libfsutils/ensure-dir.c ./libfsutils/tmp-files.c
Modified-directories: 
New-patches: arch@repose.cx--03/tla--devo--1.1--patch-8
    lord@emf.net--2003b/tla--devo--1.0--patch-82
    lord@emf.net--2003b/tla--devo--1.0--patch-83
    lord@emf.net--2003b/tla--devo--1.0--patch-84
    lord@emf.net--2003b/tla--devo--1.0--patch-85
    lord@emf.net--2003b/tla--devo--1.0--patch-86
    lord@emf.net--2003b/tla--devo--1.0--patch-87
    lord@emf.net--2003b/tla--devo--1.1--patch-34
    lord@emf.net--2003b/tla--devo--1.1--patch-35
    lord@emf.net--2003b/tla--devo--1.1--patch-36
    lord@emf.net--2003b/tla--devo--1.1--patch-37
    lord@emf.net--2003b/tla--devo--1.1--patch-38
    lord@emf.net--2003b/tla--devo--1.1--patch-39
    lord@emf.net--2003b/tla--devo--1.1--patch-40
    lord@emf.net--2003b/tla--devo--1.1--patch-41
    lord@emf.net--2003b/tla--devo--1.1--patch-42
    lord@emf.net--2003b/tla--devo--1.1--patch-43
    lord@emf.net--2003b/tla--devo--1.1--patch-44
    lord@emf.net--2003b/tla--devo--1.1--patch-45
    lord@emf.net--2003b/tla--devo--1.1--patch-46
    lord@emf.net--2003b/tla--devo--1.1--patch-47
    lord@emf.net--2003b/tla--devo--1.1--patch-48
    lord@emf.net--2003b/tla--devo--1.1--patch-49
    lord@emf.net--2003b/tla--devo--1.1--patch-50
    lord@emf.net--2003b/tla--devo--1.1--patch-51
    lord@emf.net--2003b/tla--devo--1.1--patch-52
    lord@emf.net--2003b/tla--devo--1.1--patch-53
    lord@emf.net--2003b/tla--devo--1.1--patch-54
    lord@emf.net--2003b/tla--devo--1.1--patch-55
    software@srparish.net--2003tla/tla--devo--1.1--base-0
    software@srparish.net--2003tla/tla--devo--1.1--patch-1
    software@srparish.net--2003tla/tla--devo--1.1--patch-2
Removed-patches: 

Patches applied:

 * lord@emf.net--2003b/tla--devo--1.0--patch-82
   fixed lock-breaking bug effecting local archives

 * lord@emf.net--2003b/tla--devo--1.0--patch-83
   add support for ~/.arch-params/path

 * lord@emf.net--2003b/tla--devo--1.0--patch-84
   update =THANKS

 * lord@emf.net--2003b/tla--devo--1.0--patch-85
   fixed a compiler warning

 * lord@emf.net--2003b/tla--devo--1.0--patch-86
   fixed a compiler warning

 * lord@emf.net--2003b/tla--devo--1.0--patch-87
   fixed use of wrong array index ls-pristines

 * lord@emf.net--2003b/tla--devo--1.1--patch-34
   ={THANKS,TODO} updates

 * lord@emf.net--2003b/tla--devo--1.1--patch-35
   add the ancestry command

 * lord@emf.net--2003b/tla--devo--1.1--patch-36
   =THANKS update

 * lord@emf.net--2003b/tla--devo--1.1--patch-37
   merge in lock fix from 1.0

 * lord@emf.net--2003b/tla--devo--1.1--patch-38
   extend the ancestry command with -i nad -p

 * lord@emf.net--2003b/tla--devo--1.1--patch-39
   fixed some compiler warnings

 * lord@emf.net--2003b/tla--devo--1.1--patch-40
   merge in ~/.arch-params/path support from 1.0

 * lord@emf.net--2003b/tla--devo--1.1--patch-41
   merge in fixes from 1.0

 * lord@emf.net--2003b/tla--devo--1.1--patch-42
   use tree-version by default in ancestry

 * lord@emf.net--2003b/tla--devo--1.1--patch-43
   add function arch_log_contents

 * lord@emf.net--2003b/tla--devo--1.1--patch-44
   arch_star_merge lib routines coded

 * lord@emf.net--2003b/tla--devo--1.1--patch-45
   star-merge command coded

 * lord@emf.net--2003b/tla--devo--1.1--patch-46
   fixed argc check in star-merge

 * lord@emf.net--2003b/tla--devo--1.1--patch-47
   merge ls-pristines fix from 1.0

 * lord@emf.net--2003b/tla--devo--1.1--patch-48
   make tmp, not ++pristine scratch trees in star-merge

 * lord@emf.net--2003b/tla--devo--1.1--patch-49
   basic star-merge debugging

 * lord@emf.net--2003b/tla--devo--1.1--patch-50
   --help touchup for star-merge

 * lord@emf.net--2003b/tla--devo--1.1--patch-51
   fixed archive-mirror -H typo

 * lord@emf.net--2003b/tla--devo--1.1--patch-52
   in ensure_directory_exists, handle symlinks to directories

 * lord@emf.net--2003b/tla--devo--1.1--patch-53
   fixed a star-merge bug

 * lord@emf.net--2003b/tla--devo--1.1--patch-54
   merge 64bit and GNU-util-path fixes from srp

 * lord@emf.net--2003b/tla--devo--1.1--patch-55
   =THANKS update

 * software@srparish.net--2003tla/tla--devo--1.1--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-50

 * software@srparish.net--2003tla/tla--devo--1.1--patch-1
   sftp fixed for 64 bit platforms

 * software@srparish.net--2003tla/tla--devo--1.1--patch-2
   added config options gnu-{diff,patch,tar} to specify path

